bitkeeper revision 1.940 (40c5a0a5VY_RJcApOo3Gmxz36JQSrQ)
authormwilli2@equilibrium.research.intel-research.net <mwilli2@equilibrium.research.intel-research.net>
Tue, 8 Jun 2004 11:19:01 +0000 (11:19 +0000)
committermwilli2@equilibrium.research.intel-research.net <mwilli2@equilibrium.research.intel-research.net>
Tue, 8 Jun 2004 11:19:01 +0000 (11:19 +0000)
commit119951c48af41c7b0f0073fd0c3c6a6f551caa89
treeeeb1b85322193133c997e724914f26ae0c6fe9c1
parent0d8b8558a706cce617c95dd68f7fb4d43c6639aa
parent21f0255f9c03c403c4cd6803100c1ada436f3b33
bitkeeper revision 1.940 (40c5a0a5VY_RJcApOo3Gmxz36JQSrQ)

Manual merge.
tools/examples/xc_dom_create.py
tools/xend/lib/blkif.py
tools/xend/lib/main.py
tools/xend/lib/manager.py